From 47cbe26cadfc42f1f180e5e4ac51b72caf8316a7 Mon Sep 17 00:00:00 2001 From: "cl349@arcadians.cl.cam.ac.uk" Date: Thu, 18 Nov 2004 18:37:24 +0000 Subject: [PATCH] bitkeeper revision 1.1159.1.438 (419cebe4keq2PnRNY9NpGUPu_tQZJw) sched.h, asm-offsets.c, traps.c: Fix fallout from sync w/ head. --- xen/arch/x86/traps.c | 4 ++-- xen/arch/x86/x86_32/asm-offsets.c | 20 +++++++++----------- xen/include/xen/sched.h | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index 149fe50f3a..dce0b7d736 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -464,7 +464,7 @@ asmlinkage void do_general_protection(struct xen_regs *regs, long error_code) { struct exec_domain *ed = current; struct domain *d = ed->domain; - struct trap_bounce *tb = &d->thread.trap_bounce; + struct trap_bounce *tb = &ed->thread.trap_bounce; trap_info_t *ti; unsigned long fixup; @@ -616,7 +616,7 @@ asmlinkage void do_debug(struct xen_regs *regs, long error_code) { unsigned int condition; struct exec_domain *d = current; - struct trap_bounce *tb = &ed->thread.trap_bounce; + struct trap_bounce *tb = &d->thread.trap_bounce; DEBUGGER_trap_entry(TRAP_debug, regs, error_code); diff --git a/xen/arch/x86/x86_32/asm-offsets.c b/xen/arch/x86/x86_32/asm-offsets.c index a9768854ea..afb12ea6aa 100644 --- a/xen/arch/x86/x86_32/asm-offsets.c +++ b/xen/arch/x86/x86_32/asm-offsets.c @@ -34,19 +34,17 @@ void __dummy__(void) OFFSET(XREGS_orig_eax, struct xen_regs, orig_eax); BLANK(); - OFFSET(DOMAIN_processor, struct domain, processor); - OFFSET(DOMAIN_shared_info, struct domain, shared_info); - OFFSET(DOMAIN_event_sel, struct domain, thread.event_selector); - OFFSET(DOMAIN_event_addr, struct domain, thread.event_address); - OFFSET(DOMAIN_failsafe_sel, struct domain, thread.failsafe_selector); - OFFSET(DOMAIN_failsafe_addr, struct domain, thread.failsafe_address); - OFFSET(DOMAIN_trap_bounce, struct domain, thread.trap_bounce); + OFFSET(EDOMAIN_processor, struct exec_domain, processor); + OFFSET(EDOMAIN_vcpu_info, struct exec_domain, vcpu_info); + OFFSET(EDOMAIN_event_sel, struct exec_domain, thread.event_selector); + OFFSET(EDOMAIN_event_addr, struct exec_domain, thread.event_address); + OFFSET(EDOMAIN_failsafe_sel, struct exec_domain, thread.failsafe_selector); + OFFSET(EDOMAIN_failsafe_addr, struct exec_domain, thread.failsafe_address); + OFFSET(EDOMAIN_trap_bounce, struct exec_domain, thread.trap_bounce); BLANK(); - OFFSET(SHINFO_upcall_pending, shared_info_t, - vcpu_data[0].evtchn_upcall_pending); - OFFSET(SHINFO_upcall_mask, shared_info_t, - vcpu_data[0].evtchn_upcall_mask); + OFFSET(VCPUINFO_upcall_pending, vcpu_info_t, evtchn_upcall_pending); + OFFSET(VCPUINFO_upcall_mask, vcpu_info_t, evtchn_upcall_mask); BLANK(); OFFSET(TRAPBOUNCE_error_code, struct trap_bounce, error_code); diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h index 6bece37490..25309b408a 100644 --- a/xen/include/xen/sched.h +++ b/xen/include/xen/sched.h @@ -59,7 +59,7 @@ struct exec_domain { u32 processor; - shared_info_t *shared_info; + vcpu_info_t *vcpu_info; struct domain *domain; struct exec_domain *ed_next_list; -- 2.30.2